From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Tue, 10 Apr 2012 15:21:19 +0000 (-0400)
Subject: format: move shell_format_int_alternative_output() to ShellJS
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6683
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=49d8e6da404d9d715ec1a1544d6645ce9a83cf28;p=gnome-shell.git

format: move shell_format_int_alternative_output() to ShellJS

gnome-shell-extension-prefs uses format(), but can't pull in Shell
(which is a dependency for the module), since that in turn would pull in
Meta. Fix this by moving the introspected int format function to ShellJS
instead.

https://bugzilla.gnome.org/show_bug.cgi?id=673106
---

diff --git a/js/misc/format.js b/js/misc/format.js
index 74972ac7f..c30a1bac0 100644
--- a/js/misc/format.js
+++ b/js/misc/format.js
@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Shell = imports.gi.Shell;
+const ShellJS = imports.gi.ShellJS;
 
 /*
  * This function is intended to extend the String object and provide
@@ -50,7 +50,7 @@ function format() {
                         case 'd':
                             let intV = parseInt(args[i++]);
                             if (hasAlternativeIntFlag)
-                                s = Shell.format_int_alternative_output(intV);
+                                s = ShellJS.format_int_alternative_output(intV);
                             else
                                 s = intV.toString();
                             break;
diff --git a/src/shell-js.c b/src/shell-js.c
index 8267fdc98..6657b4879 100644
--- a/src/shell-js.c
+++ b/src/shell-js.c
@@ -79,3 +79,15 @@ shell_js_add_extension_importer (const char  *target_object_script,
   JS_EndRequest (context);
   return ret;
 }
+
+/**
+ * shell_js_format_int_alternative_output:
+ * @intval:
+ *
+ * Returns: (transfer full):
+ */
+gchar *
+shell_js_format_int_alternative_output (gint intval)
+{
+  return g_strdup_printf ("%Id", intval);
+}
diff --git a/src/shell-js.h b/src/shell-js.h
index 26cbf4d82..fd8530480 100644
--- a/src/shell-js.h
+++ b/src/shell-js.h
@@ -11,6 +11,8 @@ gboolean shell_js_add_extension_importer (const char   *target_object_script,
                                           const char   *directory,
                                           GError      **error);
 
+gchar   *shell_js_format_int_alternative_output (gint intval);
+
 G_BEGIN_DECLS
 
 #endif /* __SHELL_JS_H__ */
diff --git a/src/shell-util.c b/src/shell-util.c
index e7be8129b..0a1baab39 100644
--- a/src/shell-util.c
+++ b/src/shell-util.c
@@ -868,15 +868,3 @@ shell_util_wifexited (int  status,
 
   return ret;
 }
-
-/**
- * shell_format_int_alternative_output:
- * @intval:
- *
- * Returns: (transfer full):
- */
-gchar *
-shell_format_int_alternative_output (gint intval)
-{
-  return g_strdup_printf ("%Id", intval);
-}
diff --git a/src/shell-util.h b/src/shell-util.h
index 2b21886a6..9208099ad 100644
--- a/src/shell-util.h
+++ b/src/shell-util.h
@@ -52,8 +52,6 @@ gboolean shell_session_is_active_for_systemd (void);
 gboolean shell_util_wifexited                  (int               status,
                                                 int              *exit);
 
-gchar    *shell_format_int_alternative_output  (gint              intval);
-
 
 G_END_DECLS